Reduce locking overhead by not repeatedly getting the paintable iface.

2007-01-25  Matthias Clasen  <mclasen@redhat.com>

        * gdk/gdkwindow.c: Reduce locking overhead by not repeatedly getting
        the paintable iface.

svn path=/trunk/; revision=17213

diff --git a/ChangeLog b/ChangeLog
index efb0acdc4cee0a5dfff729d6d86222b0f17f97f2..24c368dc7b7f38f6a1cc3f5549831c11add28760 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-25  Matthias Clasen  <mclasen@redhat.com>
+
+       * gdk/gdkwindow.c: Reduce locking overhead by not repeatedly getting
+       the paintable iface.  
+
 2007-01-24  Michael Natterer  <mitch@imendio.com>
 
        * gtk/gtkwidget.c (gtk_widget_set_state): revert generic disabling

diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 3739b8ea98377a318cd24d26c7d04b855eb5e29d..b65fab993e158064aa9a7eb2608db9f2c0642517 100644 (file)
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -980,10 +980,13 @@ gdk_window_begin_paint_region (GdkWindow *window,
   if (GDK_WINDOW_DESTROYED (window))
     return;
 
-  if (GDK_IS_PAINTABLE (private->impl) &&
-      GDK_PAINTABLE_GET_IFACE (private->impl)->begin_paint_region) 
+  if (GDK_IS_PAINTABLE (private->impl)) 
     {
-      GDK_PAINTABLE_GET_IFACE (private->impl)->begin_paint_region (GDK_PAINTABLE (private->impl), region);
+      GdkPaintableIface *iface = GDK_PAINTABLE_GET_IFACE (private->impl);
+
+      if (iface->begin_paint_region)
+        iface->begin_paint_region ((GdkPaintable*)private->impl, region);
+
       return;
     }
 
@@ -1048,10 +1051,12 @@ gdk_window_end_paint (GdkWindow *window)
   if (GDK_WINDOW_DESTROYED (window))
     return;
 
-  if (GDK_IS_PAINTABLE (private->impl) &&
-      GDK_PAINTABLE_GET_IFACE (private->impl)->end_paint) 
+  if (GDK_IS_PAINTABLE (private->impl))
     {
-      GDK_PAINTABLE_GET_IFACE (private->impl)->end_paint (GDK_PAINTABLE (private->impl));
+      GdkPaintableIface *iface = GDK_PAINTABLE_GET_IFACE (private->impl);
+
+      if (iface->end_paint)
+        iface->end_paint ((GdkPaintable*)private->impl);
       return;
     }
 
@@ -2425,10 +2430,13 @@ gdk_window_process_updates (GdkWindow *window,
   g_return_if_fail (window != NULL);
   g_return_if_fail (GDK_IS_WINDOW (window));
   
-  if (GDK_IS_PAINTABLE (private->impl) &&
-      GDK_PAINTABLE_GET_IFACE (private->impl)->process_updates)
+  if (GDK_IS_PAINTABLE (private->impl))
     {
-      GDK_PAINTABLE_GET_IFACE (private->impl)->process_updates (GDK_PAINTABLE (private->impl), update_children);
+      GdkPaintableIface *iface = GDK_PAINTABLE_GET_IFACE (private->impl);
+
+      if (iface->process_updates)
+        iface->process_updates ((GdkPaintable*)private->impl, update_children);
+
       return;
     }
   
@@ -2561,11 +2569,13 @@ gdk_window_invalidate_maybe_recurse (GdkWindow *window,
   if (private->input_only || !GDK_WINDOW_IS_MAPPED (window))
     return;
 
-  if (GDK_IS_PAINTABLE (private->impl) &&
-      GDK_PAINTABLE_GET_IFACE (private->impl)->invalidate_maybe_recurse)
+  if (GDK_IS_PAINTABLE (private->impl))
     {
-      GDK_PAINTABLE_GET_IFACE (private->impl)->invalidate_maybe_recurse (GDK_PAINTABLE (private->impl), region,
-                                                                        child_func, user_data);
+      GdkPaintableIface *iface = GDK_PAINTABLE_GET_IFACE (private->impl);
+
+      if (iface->invalidate_maybe_recurse)
+        iface->invalidate_maybe_recurse ((GdkPaintable*)private->impl, 
+                                         region, child_func, user_data);
       return;
     }